Removed as of yet unneeded functions