Removed some unused stuff, commenting them for later use