Removing old framework cruft
Even more cruft removal