Removing unused vars