remove garbage dir
a bunch of changes