Added removal of functional dependencies