got rid of more legacy code