Removed some unneeded statements