Removed any uneccessary code