Mark some cruft and places for improvement