Removing some unneeded code