Removed more functions from Database