removal of unnecessary framework stuff