WEB-21 Cleanup and final commit