removed some code (yay test protection)