Update TODOs
Adjusted load SMAX, removed dead code