Update setup to remove unused elements