Revert "Optimization, Swag optimization."

This reverts commit 30d2cbd016d4aaa81ed0db143eb1243862d1e664.