remove unused declare and headers