Cleans up unnecessary properties