Removing redundant code

Deciding to do two taxonomies rather than metaboxes