frameworks: fixes for 4.4.2 and cleanup

i am stupid lol ^^