code base cleanup