Removing unnecessary properties