Cleared out old API, dead code