cleanup of extra code