Clean up container create forms