Code clean up

Remove vestiges of external input