Removed some uneccessary code