Small Updates

Removing unnecessary code