remove unnesscary calls
fix conflict