Issue #39 - Removing unneccessary tags and uses.