Fix, remove incomplete and possibly unnecessary sub