Removing licensing and MAS code