Cleanup

Some more cleanup