Removing dummy vars, checking types.