Removing Rackspace reference, adding TODO