Remove need for support library. Do some fudging around of things.