Some clean up of code
Deleted unused class.