Code clean up

removed deprecated method, files, and redundent lines of code.