Some cleanup, removed unused folder mixins