Revert "Additions and cleanup"

This reverts commit 93a10255711ad38a78d69c17f9ee4aca15d79cf1.