Removing useless code, updating license