Cleaned up Form. remove edit

Ready to start testing