Cleanup (Insight/Sensio) fixes #12