Last cleanup

Maybe