work in progress
Removed unused settings