Removed some code that wasnt used