Removed unused resources and cleaned up stuff