Tried to clean up plugins' return values. Not working yet
Finished cleanup