First pass at removing hardcoded post type refs