#67 cleanup