Remove large thumbnail renderring

and tidy up a bit