Tidied up left over code from trying to fix binding issue