cleanup of shiz