cleanup code - remove unused expressions