Removed temporary code now that wonder master is updated