Remove unused code, modify settings