Removed unwanted repo defs, dependencies, imports