Removing unnecessary properties, closes #3