Removed some shit, added some other shit