Removed settings and cleanups