25618B - getting close to max
remove unused code, cleanup