remove common, clean up some files