removing the dead comments
updating the forms to be named consistently across modules