Tidy-ups and removal of byte[]