Removing cruft from app-state