cleanups
4 compatibility only