Removing old FH APIs and wrapping filth