More error cleanup and content cleanup for vanilla