Remove (both functions) now works maybe