Revert "sprint fixes"

This reverts commit dc5312fcc07b40e49d0c422806f415ca935694e2.
Revert "sprint fixes"

This reverts commit b568b0b375d6d01954c9e9e2d37906f307bc6736.
sprint fixes