Removing dead weight

Removing dead weight