Some cleanup

Some cleanup