Complete: Cleanup deprecated JSPs
Complete: Cleanup deprecated Servlets