Various small tweaks
Removed unused file