Finally got rid of Notes --