Issue: #444 - Remove extra files