2.0.3.2

More code cleanup