Cleanup to get slimv working