removing some files.
Removed direct usage of setup.
Removed unrequired tests and removed dependency on setup.