Clean up junk code