#30 cleapup