Dump unused code
Minor code cleanup