#111 cleanup