Remove configuration data
- General code cleanup
- fix non-layout/non-view controllers (like for dynamic images)