Added remove / clear operations + fixes