Removing stale, unused class