Removed legacy functions, reenabled file folder clearing