remove unused vars, add warnings for future removal