Remove unused, complex logic. Thanks codeclimate