First cleaning pass

Deleted unused code