OC-5826
Cleaned unnecessary files and reverted some other files