Cleanup

More clean up