support #bundle

final clean up