Removed unused imports & bug fixes