merge in dev
remove unused files