Remove unnecessary imports and other code. Refactor folder object code