Cleanup on the go
Settings working