remove polymorphic association + add temporary code for custom callback