Adding ability to remove extra data