Removal of Uneeded

Removed unneeded code as well as added some preliminary code for using
events.