code cleanup of unused elements