removed residual dependancies