almost have remove working