Again code cleanup

Trying to merge with master