Cleaning up ST2.2 Plugin