vh-main cleanup