Cleanup old files and references
Further cleanup