Clean up
Readd settings