Cleanup

Some cleanup