clean up master and still working