removed some functions that did not belong in framework