Remove APC and move a few things around, since they're either no longer needed, or was a horrible workaround