Cleanup edir code, always build edir code