Fixed one-to-many navigation property naming.

Also deleted dead code.