Removed some complex objects that didn't need to be complex