remove unused and testing stuff