Variables unused removed