More cleanups, there is issue with srcclean that needs to be taken care as well, just doing now what we can