way cleanup