cleanup Version 4 and 5 parts