Removed things not related with vanilla