keep reference in model to source
remove old comments