Cleanup

Cleanup and removed warning, re-added forgotten things from the last push