Removed uneccessary stuff