#15 cleanup