Remove unnecessary boilerplate elements