Decrapification, Entity Cleanup
Webservice Resources added