Delete redundant file & tidy up

Tidying some stuff up, removed an old stub file and remove one line of code because the following line does the same thing anyway.