Cleanup merge #3

Last cleanup