Finished removing simple form
Commented out broken code