form deletion

deleted form and cleaned up a bit