Clean up
comment out scaling