Remove compatibility layer + cleanup