Tidy up - delete old code