Remove excess

Streamline code