Cleanup some functions that shouldn't return values