Removing poor (conceptual) code