change framework and remove unused references