Remove association belongs_to for now; Remove association class check