Removed obsolete code
Tweak for nested folder compat