some code cleanup, remove structure which is no longer used.