remove legacy code (2)