Cleaned up old notes/comments