Cleaned up description hooks Closes #2125.