Remove unnecessary dependency
Begin refactoring and testing note model functions