not removing functionality on self reference / mapping anymore