Remove/reorganize some crap.