Add utils.removeNote to clean up code