Deleted some wrong/unneeded functions
Deleted some wrong/unneeded functions