Cleanup of unused vars