Removed dump() calls