solution cleanup and WebApi fixes