Adding settings and cleanup