Removed some unneeded code...