remove garbage
various holes related fixes