Remove unused vars
Merge branch 'check' into dev