Deleted some unneeded code