Removing short tags, WIP