Cleaning up code of messages and callbacks
Merge branch 'refs/heads/relation' of https://github.com/AdeleResearchGroup/ApAM.git into HEAD