removed some elements not being used