General item code cleanup