remove unused vars, add useful comment