Remove old logic + add Monaco version