Remove bits of APIs that are unneeded. First step in attempting to Do It Right™