Remove types from master branch