remove unneeded code after recent refactoring