Removed uneccessary logic