update for 6.0.1, remove unused code