Purged unnecessarry classes (X-Services remnants)