Removed unused items

Cleanup of old items