remove special handling for NYC. Closes #4