remove a lot of useless scripts
resolve conflicts