Cleared out unnecessary functions