Remove unusued code