MAID-523 Removing dependencies