Removed relationship stuff -- #12