Some cleanup for future 1.1.0 version (other GUI perhaps)