WebStorm Clean-Up