Tidy up - some redundant files removed.