cleaning up files layouts etc