Added messenger library files and removed some unneeded variables