Removed some dead code, lol