Removed redundant code. Aligning with #142 and #122.