Removed and tidied remnant files