Removed Types.scala and cleaned up dead endpoints