Removed some extra fields