Remove unused method and other misc.