removed unneeded pieces of code
Revert "removed unneeded pieces of code"

This reverts commit 5d31388abc5f5693766b2ee5f94accd9a1d41fe0.
removed unused files