file clean up  and config.xml changes