cleaned up options and metaboxes