Drop unused code
Minor cleanups