Remove unnecessary properties