Removed uneeded stuff