[PATCH] init call cleanup