Fix strict issues, remove now un-needed useInsideWrapper