cleanup and get spring dao injection working