Deleted currently unused classes and changed Message to better use timestamp