more cleanup of hardcoded stuff