Revert "optimizing imports"

This reverts commit 1c1264f8a9263f746ba8684225e7d63762745605.
updated build gradle