removed non-framework stuff