removed deprecated couplings and cleaned code