Minor:  Cleaned up code, removed obsolete comments along with unused /includes/constants/dialogue folder