Revert "Revert "Cleaning up unwanted code""

This reverts commit bd94a49fcbc6822b84a928a5332072ebe9e3ad7c.