Revert "Revert "remove stuff""

This reverts commit 8802945c3cf08d70ddcc83012ac300402a25c81b.