Frameworks: Cleanup

Change-Id: I7e7baff0f22b7b231b9f388a620e192788b8dae1