More tidy up - remove functions I don't need