cleanup compat to a shorter version