Framework Remove due to architecture issue