Bus clean up