Cleanup unused vars