Sorted out dependency loop
Fixed clean target