Removing external dependency