Removed some code that wont be used