Remove unnecessary fields/code