update plugin codebase for use with fw/1 v2.5 and cleanup