Cleared out all unused code