Cleaned out unneeded functions