cleaning up comments and deleting unsued methods