A little cleanup of unused fns and reflection