Removed some unneeded code
revert me
Revert "revert me"

This reverts commit 2f632bd4adbf0873ced4f034f05dab83709d5449.