update to web api 2 and clean up