code cleanup of unused items