Some cleanup



<!---
@huboard:{"order":77.0}
-->