Cleaned up advice removal, added sugar for adding advice
Merge remote-tracking branch 'origin/master'