Inlined some functions in Framework class, removed some functions