Removes unused
Merges master