Cleanign unused function branches added for debugging.