Fixed the comments.
Removed useless defadvice.