Removed unused methods, added join table

Change-Id: I55438ed73769ee88e7b7820ab153d0ae9d51b336
updated methods

Change-Id: I74276b202bc21266f753e60fca05f6cd0072412a