remove unnecessary dependency and miscellaneous fixes