Miscellaneous cleanup v2