continue clean up

Continue clean up