Clean up some unused code
Change default timescale to 2