Cleaned up unneeded Object[] stuff