Cleanup of some forms