Update license, Remove unused code, Convert annotations to new behat format