removing stuff for now until we nail down the details