Updated to remove old files