Remove some useless code and singletons#1

williamd1k0 wants to merge 1 commit intopigdevstudio:masterpigdevstudio/keepm_small:masterfrom

williamd1k0:some-changeswilliamd1k0/keepm-small:some-changesCopy head branch name to clipboard