Removed deprecated code
Removed unused resources