remove unused code and config settings