Clean it up
Revert back and let's tackle this problem again