cleaned up and removed unneeded functions