Remove unsafe stuff and things that belong elsewhere