Remove unused vars

Do some cleanups