Remove all code merged from master