Api Cleanup & Minor core changes