Clintonb/api cleanup

@fredsmith @martynjames -- here's the branch that @clintonb submitted for PR yesterday -- i guess we can just merge it right into release?