Clean up. Fix code. Remove useless code.
Opps. Missing change