Revert "make entries and feeds independent via association table"

This reverts commit 5d1a5d7dfbada00916330ac92e5af1fbfd01ebb4.