fix build after redesign
remove unused code