Remove extras properly and add symlink