Removed some more shit