Removed all association methods. Put them all back