Removed unused dependencies and brought to compile state.