#905 Some cleanup