sanitize some TODOs and unhealthy code (#89)

24 files changed