Removing redundant noteplayer definition
Merge branch 'noteplayerRefactor'