Marvel cancels more FF, X-Men related licenses for merch