some cleanups since this did fix the doctrine mapping problems