Tweaks and removes ^^

The usual stuff