Topic/cleanup

Misc cleanup