clean up of unused classes, added web response checking/exception throwing