Removed more useless stuff