Deleting duplicated, useless functionality to help clean house for shortcode refactoring...