Revert "Some cool updates"

This reverts commit f1ca06fefb2e343ded6794875f24177d0e4d4684.