Some cleanup

simple