Remove some pre-autoloader leftovers
readability improvement