Merge "Removed some dead code and a dead asset"