Revert "New functions for awesome stuff"

This reverts commit 926bca5674707290ed6e7dbce2bc5c718492991d.