removing unwanted require statements
merging the changes