removed lots of support library use