Cleanup and make Sensiolabs Insight happy