Updated to Nu V3.3, code cleanup