Removed things that aren't ready yet