Issue: #240 - Removing extra files