Datamanager - removing unnecessary stuff

Removing old TODO comment, that has already been resolved
Changes in priority computation