ticket:2 code cleanup; build tools update