Removed JSPs and not required stuff