Removed traces
Minor clean-up
Todo update