Cleanup to js