Removed some deleted files, tweaked API calls.