*provided preliminary solution for parsing $0 inside messages (first need to check if this will cause regressions)
*removed unnecessary files