Cleanedup
1.2.0.6