Removed unneeded functions for now