Removed some useless junk