Tidied up uneeded coded