removed associative objects from model
cleaned up dao class