#300 cleanup