remove media dock code from bad merge