Clean up the edit profile form and spec