Code Cleaning

I have removed some code that was not used ready for me to create new features.

Let me know if you have any questions.

(Code has been tested and works perfectly)