remove unused and add some