#30 cleanup