Small changes

Skipped commits, that remove new stuff