Removed code which was accidentally included in a previous commit
Deleted unused declarations