Upgraded to manifest version 2 and removed all inline code